From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 18:11:40 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0c1b014bcd625bb88708aff3c7d401aa3b88fa07;p=emacs.git

merge from trunk
---

0c1b014bcd625bb88708aff3c7d401aa3b88fa07